Reorganise tests to test with and without mongo types.

Signed-off-by: John Oliver <johno@insightfullogic.com>