BusinessTripControllerViewer: one test case was failing due to current date dependency. Dependency resolved, test code made a lot cleaner
Merge remote-tracking branch 'origin/fix' into fix