fix formatting unit tests (and code)