Address review comments and simplify tests.