Refactered method to count days. Added some failing tests.
Removed deprecated methods and corresponding tests.