fix commit for #105. add integration tests