progress, tests and test framework update