043b8d4 split test2 into sub components