Fixed test bench and minor issue with pops