* Revision describe rebaseable * Fix up for rebase * Some tests * moretests * Forgot part of the refactor! * Fix unit tests * Change e2e tests and respond to feedback