Making import relative and fixing test runner