Added some tests
0.6.0