Fixes minor bug and adds test cases for wcp12