tidy up test coverage and remove one bug
post merge clean up of SmokeWebTest
removing 'funny method' from handler
Merging