Fix issues with the tests

Signed-off-by: Don Naegely <naegelyd@email.chop.edu>