Fixed bug with week of year, added more tests