re-add tests
fixes