fix timeout + fix regex for tests - WIP