Add locations + tests