Add modules/utilities and update tests