Remove test and add count