Change from Integration into System test class
Move test to Test directory