Fix tests
Fix N+1 requests problem
Fix typo
Avoid using helper
Rm empty line
Merge pull request #29 from MaximAbramchuck/some_improvements

Some improvements