Second round of Tests

I have most of these tests working. Still am behind though and need to git the other tests as well.