Not sure why I wasn't using the static values in the tests, but I am
now. Waste of a commit? Pah.