Update references
Update solution
Merge pull request #4 from SlavaRa/tests-refactor

small refactor