Created a 'facade' layer over Constants file. Updated UnitTest