Finish with refactoring devel - all test examples work + almost all tests pass.