Closes #308 by adding the missing Qualys tests.
Closes #353 and closes #352
Closes #344
Merge commit '83b8fc460db18dcfabd0ec7b5a313adbf68fca7d' into HEAD