Fixed Tests. 66% coverage.