Reduce time taken to run testcase by 0.1 minutes :P

Signed-off-by: crynobone <crynobone@gmail.com>
Move some code to setUp() method.

Signed-off-by: crynobone <crynobone@gmail.com>
Revert potential breaking BC on 2.1.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'

Signed-off-by: crynobone <crynobone@gmail.com>