Bug 943337 - Merge 2 kill card view tests, fix typo in tbpl manifest r=g...

...wagner