Updated test bench to be much more thorough