added more unit tests, added toilet unit tests, moved exceptions to correct place