Imports of single exceptions are needed to run tests. Corrected
indentation problem in few constructs.