Adding tests
Merge branch 'working'