Restore the componentsOf tests for now