Updated tests

Tests updated to reflect latest changes