Fixed All Tests

Designations and the new strings were breaking almost all of the tests. The tests are now passing again and a few bugs have been rooted out.

We are now ready to refactor.

Signed-off-by: Daniel Long <wizazzle@gmail.com>