small changes to the tests to get some initial results