Added some convenience bits of code and modified the UnitTest accordingly.