Container class tests update