Added tests for moving teams
resolved git merging conflicts