Cleaned up test case