Updates that were kicking back errors

Just a few small changes to the testing that is being done... but all seems well, let me know how I did...