Implement better test case