Finance Module -> AP Sub-system: Fixes for failing NUnit Test 'nant test-main-navigation-screens'.