Fixed issues with dates and completed simple unit testing