Refactored State class, conducted State component tests.