fix tests, ++autofixture, all passing now