7.x 1.x

adding tests and pulling from d.o