Refactor test cases
Changed to use Ebean query instead of finder