Fixed / complete Unit Tests