And cleaned up all warnings in the test code.