Spell ifdef correctly
Move esi test files to the test library