Update e2e test
Disable tests
Merge branch 'cellfire' into cellfire-d