Some more tests
Updated for 0.1.0 release