fix test dependencies, work around failing mock/expect