WIP adding tests, incomplete coverage