fixes so that test project compiles, sttil need to fix tests themselves...