[feature/uniformed-testsuite] Step 2