Added two new directories and split up testcases by version