Merge "Moved part of test cases to another class"