Moved configuration to Admin, testing