Some clean-up on tests and code.
Updated to latest M8+ Kotlin Snapshot