Added alloc_map merging, fixed bug with je src1/dest types being not 'none', enabled remaining tests to run with vm/gcc.