Test suites added
Some minor refactoring. All tests running.