More tests and exceptions added