Some more quick unit tests. (these will need refactoring)

Signed-off-by: Richard Bagshaw <richard@bagshaw.co.uk>