Fix simple test, wire up locations test to all tests