fix tests + learned something: use FunctionalTests for tests, where explicit commits are made