Remove unnecessary instance methods of collection
Update tests for postgres