Revision to some tests. Made certain tests nodidit