Please also move this back to the manual tests too. Otherwise we will miss for testing this piece.