XPATH: Substantially simplified test architecture.
XPATH: Substantially simplified jUnit tests.