brings tests branch up to date