Made BasicModel tests independent of Location implementation