Fix tests and remove e2e for checkin