Fixing tests for neon
8 files changed