Added tests to 3.1
3.2 refactored