Use pyquery for test and other changes