Refactor Spec Tests

Lets simplify these tests as much as possible.