Tests all pass with the new directory structure