Removed unnecessary test-examples; housekeeping