added tests, removed any references to rplos