Simplified the expression processor and cleaned up tests