Integrating to new freedom v.0.5.2 integration test convention