Refactor salt key tests to be raet compatible