Added some day and night variables.  Refactored the tests.