Integrated USB search, build OK; test OK