Remove useless skip-test and few refinements