Finish tests for the 2-nd part