First round of tests and improvements