[skip ci] WIP: and somehow, the more tests I get to pass, the more that fail. something definitely not right.