Add test to make sure correct order gets loaded
Save self after (de)activating