Test clean up
Getting split counting tests ready