Merge "Add unit tests for tempest cleanup"