Fix test execution order and remove conditional build