Added some more tests

Moar tests! Tests good!!