GBP core tests improvements