Added additional functionality for the SUT

This change will not affect anything, however, it'll allow me to use
this within my kiss framework a bit more easily.