add tests and adjust to package relative import