Update tests based on feedback