(Fix for: Renamed test suite directories to "tests" and "expected")