Initial unit test for generateSettlementInstruction implmented with minor
changes to project structure and core classes