Revert "2.1 and 2.2 done with tests"

This reverts commit 5af67874a2d14eef791d2ec104cebefe68f0a320.
Revert "Revert "2.1 and 2.2 done with tests""

This reverts commit 1d3581ddd48eafcbfd57c86d7b59cba18b07dfe5.
woops meant that 3.1 and 3.2 are done