Remove boilerplate from test, fix merge?
Numerical errors.