Small test fix
Couple of small adjustments