Test cleanup for 100% coverage