added class for tests, refactored popups, mods now work