changing name of test, and improvements