Corrected expectations of tests.
Excluded support for FunctionService in ExpressionMenu test
Better separation of ExpressionService and StatementService