fix failing tests

cleanup actions created outside specific test
for rating handler, use user from rating, not thread variable
annotations - return ids of created
Merge branch 'master' into integration