Additional tests for Xamarin Bug 16742 + style enhancements