joj68: Modify tests to import from correct place