Modified tests for running with maven