Partially added tests