Fixed JUnit tests and prepared project for AspectJ.