Modified tests to get rid of g++ warnings.