Turned test suite into two separate tests