Adding the necessary code to handle weeks.
Updating the unit tests to add weeks.
Fixing regexp error with white space removal