A few updates and 100% test coverage