Added more UnitTests and cleaned them up a bit.