Bug 7, unit tests