Removed old jock test that duplicates some coverage in another test
Added some type parameters.