Extensions: more tests + fixes for type params