Fixed tests

@edatrix, 

Here are a bunch of tests we got through tonight... it seemed like every time we fixed one, another broke! LoL.

Take a look if you want, and merge the branch when you get a chance!

R & D