Base dir fixes for unit tests