trying to clean tests up a bit