Some small fixes + Unit Test coverage for Fwk folder