SRP violation removed.
Small tests refactoring.
Additional find usages tests.