Fixed some cosmetic details (empty lines, whitespaces, indentation). Fixed a test that was breaking depending on which days you ran it.