Using relative imports
Removing sorting hack from test case.