Merge "tests: always call parent setUp"