Merge "Improve Tempest workspace manager unit test coverage"