Fix tests for Maven 2.2.1