Fix tests, establish a pattern... interesting