made the tests more thorough