Split tests
Fix test run