Bug 907652 - Unit Tests implemented