Improved experiment suite