Remove days if necessary instead of hiding them
Add unit tests for options