Added Unit Tests, still failing.