Add tests and add scale support to baseline.