merged add-tests into master