Removed a misleading error message.
Removed obsolete unit-tests.