tests: fix it all a little