Placed default values into a class. Initial unit testing.