just a few test updates
Merge pull request #164 from jdragojevic/wd-updates-5

just a few test updates
still want this test to pass on jenkins
Merge pull request #165 from jdragojevic/wd-updates-6

still want this test to pass on jenkins