Bug 841977 - Part 3: write tests