Get tests passing, fix `count`