write tests
Merge branch 'spec'