Updated components and test infrastructure