Fix compiler errors after merge (tests and scene)