Add support for sign and zero extends

Fix merge conflict

Fix merge issues

Add CHECKs to test