Fix Unit Tests

Fixed some broken Unit Tests.

Travis is still not configured to run those tests.