Add more tests; break out Guid