Proper object format validation. Test-suite fixes.