a little bit more clean up.
also added counted/counter test cases