- Fix an issue where an exception was thrown because the theme progress form didn't exist yet - Refactor a few things - Fix other tests - Add a test for wait_for