Bastion: fixing tests in engine branch.