cleaned up tests to be uniform with rest of software