Fighting with tests, at least they're doing something now
Tests pass, silly int64s