Started adding unittest cases instead of verbose print statements...