[tests] fixes missing includes, usage of removed functions

test suite still not compiling in its entirety though