Integration test support added