added testing stuff from master branch