just updating with latest test stuff from master