fix tests, build should pass now