Improve location tests
wip room tests