unfinished changes to tests