Enhancement integration tests #27