Fixed the missing parts of the testing go3 ones