WIP: squash 20secs for unit tests, 90secs for e2e