Removed TestClass, added Day data structure