replaced x * x with square(x) in fvar
removed extra test files