implementing suggestions for tests