Removed thead
Updated unit tests