fix test
Merge branch 'perceptron' into time-value-of-space