Merged the two tests and fixed errors in new parts