User/derekkg/moretesting

this is a pull request