Fix test bug courtesy of @shazow