Refactor most-popular integration tests and renmae file