Refactor tests: combine with skipping.