Added more expressions and basic expression testing