Added folders, updated dates, decoupled testing