some fixes to verify my tests are just shitty, not broken