Code split to modules to make place for FEST assertions
FEST assertions added