Minor, inline method
Minor, split a test into two
Apache License 2.0