back to dev, re-add the tests