Tidied up tests. All passing and using mock objects.
Authored by: scaryclam 2010-03-01
Parent: [r13]
Child: [r15]
