Re-add changes from original preparegui
Fix CLI tests