Improve Test Coverage