Rebuild project, slighty modify integration test