Merge remote branch 'martins/tests'