Merge "Remove unnecessary setUp and tearDown"