port remaining tests