Add some tests to clear the way for refactoring