Updated tests with recent changes