Added missing tests. Added path to Location