Develop + RDS tests

let me know if this proves to be an evil merge, and i will see what i can do to sort it.  split view it didn't look that bad.