refactoring of tests to comply with problem + count cut