Modified Unit Tests