added test framework etc