Updated tests for recent changes