reduced test setup codes
modified mock tests
modified test cases