NoTask - added back unit tests which were failing