Adjusted for more tests