Marked some of the cases as 'long' to exclude them from the smoke test.