Resolved comments, added tearDownClass