Fix tests
Fix neutron's comments
Fix CS
Fix array declarations
Fix unit tests