RDS tests cleaned up. Should be good for all providers.