cleaned test and added count