fix tests, move to rpsec