Changed tests infrastructure