Improve unit tests
GTNPORTAL-2852 Clean up and improve the usage of Resource Bundle files