More inmates and staff at Changi Prison Complex to be tested