merge testing branch

Add testing. peco needed it.