Added Location class and tests