new test framework
minor changes