Moved clean up of the test environment to an `@After` annotated method. Fixing some code styling. Original pull request: #226.
Moved clean up of the test environment to an `@After` annotated method. Fixing some code styling. Original pull request: #226.