Decoupled some test case methods