fixes for 740 support, more unit tests added