D-13944 Slight refactor
D-13944 Fixed a unit test, more to go