Test cleanup + code coverage