Adding and cleaning up tests