Add more tests

Finished in 40 secs
49 tests, 60 assertions