Fix tests
Fix SetLocation