Fix -Wreorder
Fix test build when building as subproject