testing on 2.4 and 2.5, adding basic integration test