Minor fixes for compliance, improved testing as suggested