Moved test cases to independent files