Fix paths issue from blank/default to base/default and update tests.