Fix tests for deployment