fixing the tests, 1 by 1