Fixed annoying typo bug in future-based merge
Added more tests