making testing up to date with master