Update pkg unit tests for new path, add tests