Updating Main with TEST modifications