expanding test infrastructure