Added a bunch more tests :)