Fix tests, fix snake