Fix tests, fix CS