Cleaning up for unit tests