Some final suggestion for the Test branch

Have a look and take them or leave them