Fix relative import and test import convention