Fix Location tests