Add templates for the 1bxx2 tests
Fix bugs in the 1axx1 and 1bxx1 tests
Fix bugs in the 1axx2 tests