Merge: rev758 (Stopped using fixtures for the following test cases)