Added a test for typeInfer of Decl, and removed some crud