Updating tests for refactor.
Updating components to latest commit.
Fixing minor import error.