Restore AutomaticSerialization in src/test/java