Fixed RS namespace and Fixed the tests.