FIX Reduced the aggressive error checking. Added misc unit tests.