#62: Formatting, template systems for test.
Removed unused integration test systems.
Removed conflicting methods from Aspect class.