Fixed dandelion/issues#102
Updated integration tests