BUILD-428 Splitting test for more readable test results