Fixed minor issues in the test