Merge "Update tempest hacking regarding unit tests"