Fill in a few more tests

Wrote in a few more of the tests I skipped
Expand more shorthand

I expanded some more of the shorthand I used. It seems to have fixed a
few of the problems I've been having.