100% test coverage and pass / cleanup