Refactoring
Refactored tests to remove some warnings