Fixed test
Made Arrow/Tuple less opaque
Fixed imports