problem with the tests
fixing the tests
Merge branch 'master' into tengen