First stab at tests - still more to do