ASM removed, still failing some unit tests