Added new test cases and renamed test directories. #137