cleaned up a few tests

Change-Id: I5bef4bbba962e8dfb3ff17dbe7d765900bccdda2
3 files changed