[test] small change, move types/constants upwards to conveniently exclude/comment
testcases if necessary
[buffer] re-add count which is still used if occupation info is used