got most tests working under new directory structure