Bug 971618 - Fixed unit tests - to be squished