Fix paths to work better with unit tests
Unit test scaffold