progressing on fixing tests