Added tests

Addresses #30
Err, need to get rid of it. Thanks for bringing it to notice, same thing for the one below.