Tests couldn't be run when class set to internal
minor comment fixes