moved directories around, re-enable tests