Task 129 added tests