Adding the W (weeks) flag for full duration validity

Updating the unit tests to add weeks.
Fixing regexp error with white space removal