Updating more tests