Updated test format to adapt to refactor