Improved stub tests.