Added day functionality, more unit tests