updated tests with proper count and accounting