Adding updated testing framework