Version to 3.18.5-SNAPSHOT
Revert stupid mistake. Should NOT have done that.

This reverts commit 011449bc0cc9576f67c5d031c176848450942ee6.
Change unit test to match latest change
Version to 3.18.5 for release. Fixes #517