Nalexander/bug 872756 obsoletes

Unit tests are looking good, but I'm going to leave device testing this until next week, when I intend to update the test add-on to show finer grained information.