Remove unneeded schema files
CS - Fix scope in method comment.
Refactor: Fix formatting and use of assertEquals
Merge branch '1.5-Meta' into 1.5

Meta related changes from occitech's 1.5-Nodes branch