Updated Main test class