Depend on unitest2 and refactor control panel tests