Merging with Rima's tests.