proper components, fix race with tests