Simplifications in the code to display the portfolios
New unit test for the retrieve methods on weekends