FIX: Directory layout for tests fixed