review comments; fix tests