better count on tests, added TODOs