Incorporated the latest Alberto's schema changes into unittests and also greatly enhanced the main unittest suite - only handful of fields are missing now