Fix build 192

This pull request contains my previous pull request's commits as well. But also fixes the tests in the 1.9.2 environment. If the other is closed and this one is merged It should show all required platforms passing now.

The other pull request is #379