fix celluloid dependency bug
fix integration tests