fixed some bugs handling the recent tests