Updates some tests based on modified functionality.