apply review and fix broken test suite