Cleans up enigma a bit and ignores test