Fx regression in examples
More unit tests
cleanup