Unify neutron entities & add tests

Entities were unified to reuse fields across the various methods (CRU)