Update Tests to use new build-dir behavior