rename application.xml application-test.xml; cleanups