Add some tests
Merge branch 'tests'
Update status of the project