Added exceptionHandling test
Added better exception handling
Split tests into smaller files