massaging some of the tests