Bug 907013 - Part 2: Unit tests + Integration tests