solving some minor issues with the tests