Fixed some failing unit tests
Unit tests are all passing again!