Does a small clean up of the new unit tests

Signed-off-by: mpeter28 <marshallpeters@ymail.com>