Sync custom impl with 1.0-SNAPSHOT

Exclude BinaryTest and NonPojoTest