this should fix a couple of tests, took me a while to figure it out