Issue #3263050 by Grevil, Anybody: Code style cleanup, Schema check, Basic Tests: Fix and split tests.