Updated tests for new return status