Minor tests and refactoring