Sampes converted to the tests and modified project structure