Merge branch 'improve_tests'