AVG JunitTests and bug fixes.