ticket:3 Fixed models and tests
ticket:3 Fixed tests(removed client import)
ticket:3 Merge commit. Fixed tests