Some tests around this as it's part of the core/common code base?