First working tests
Working first tests
Merge branch 'test-framework'