Test coverage and cleanup