Linearity test

Merge to master to solve conflicts