fixes and tests
flake