Test in wrong place
Refactor to use a dictionary underneath