Added more SubConverter tests

Some fixes are also included.