Misc. Changes : Test Methods, new Macros, code refactoring.