Add some tests for scalar roundtripping