add other engines, make most tests pass