More tests
Changed some exceptions and added some more stuff