[Component][WIP] fixing tests