split tests with an AND + fix some errors