Adding tests and cleaning up directories