move non-rest-specific methods into ampersand-state instead. Start to move irrelevant tests
3.0.2