Making sure that tests in aa-prop run. They weren't running at all

- fixed a few bugs
- removed unnecessary files
- renamed tests to xxxxTest.java so that surefire picks them up
- made sure that resource files are not rewritten by tests