Refactor Anorm test + adding new one

Refactoring existing tests and add new one.