Added count to cleanup
Added multiple (two digit) add test