Get the tests building
Fix bugs in initialization