Updated tests for changes