I'm going to move this issue to 6 and keep it open because the current PR only contains test cases and an update to the documentation