Merge "Remove unnecessary setUp()"