Improved Test Coverage