FunctionParser added; Brackets cleaned up; tests moved.