Removed spurious framework path.
Tidied up the tests.