Small test addition and fix