Updated unit tests slightly

Not ideal, but will do for now as there is no IOC