Bug 1115430 - Update sidebar tests to use generator functions