refactoring and additional team tests