7 Commits (feature/common-tests-update)