Use underscore methods to be consistent
Remove duplicate test case