Remove light type from constants and update benchmark tests