Couple more unit tests...one TODO note which I will implement at a later time