Merge "Separate test into reasonable multiple tests"