Standardize handling of tests in which exceptions are raised

and put all tests into the same directory. Closes #3