Improving rpsec tests